Python Refactoring